Add EmailSubscriptions
Fix routing issues