Add subscription type mapping
Add grunt files back properly