Added user:username and course:location into schemas