Application DSL - configuration
Merged w/develop