Added ability to override defaults