[#61] Add changes