SuperClass fixes. TODO:Independent instances based on params