Some necessary changes for AMO