Resolved mapping issues

- Moved "annotation-driven" to the top