#13: Added missing services, updated flag controller