Added _upgrade method, small fixes, added usage