Making prepare more configurable