API refinements. - FYP submitted version