Improved annotation-based command API
- Removed useless utility method