Added todo
Simplified resource definition. Moved same definition from profiles to main definition.
Removed hard coded JNDI name for DataSource in API which causes having SearchiskoDS in Test Cases.