Added Data Enums + some draw methods