API`s forms refactored