Updated to reflect boolmap changes