Adapted the classes to changes on the core and API libraries.
Fixed the style errors corrected on the API.