Code Cleaning for more modularity

Added Internal Maps Dependency