Adding security service and security mapper classes
resolving conflicts