[#47] Fix code to comply with new model