Refactored dependencies, added constants