Added asserts for new config params
Cleaned up constructors