API: Modified boilerplate as per comments