Rebased assistants
Enforcing assistant attribute names (fixes #264)