Modified application.yml to have general keys