Updated to reflect class abstraction changes and Auto-Instantiation