s4:provision - Some rework (continuation)