Customizations to work with out config