Constant & Prepare time
API Corrections