Uses automatic file naming convention now by default
Factored out some domain logic