added enum form macro names and added base macro data retrieving