Switch to APLv2