Improved configuration, use environment as recommended by spring