Moving configuration and options out to dedicated class