Moved defaults out of the main app file