updated javadoc
Refactoring and started on mapping annotation for exception