Auto loader changes.
removed loader class should not be needed anymore.