Refactor to match API ver. 1.4