Removed previous API definitions; Build OK; Test OK