Resolved potential cyclic dependencies when registering REST endpoints

Closes #314
Fixing attribute names for declarative services

Closes #316