Refactor Scalable OC
Add some bugfixes to be done