Reverted to older classloading method