fixing loading to be not dependent on external modules as for now