Framework Synchronization

Synchronized the classes with the changes made in the framework.