Moved start/end to config