[fix] Removing load as dependency and some refactoring