Added logic for application.yml
Further fixes to config checking logic