Added loading and loaded class management

Added loading and loaded class management and options