Adding base services mapping