Updates on BasicActionMAP