Added new classes
Updated static instance to reflect the new classes