Changed image types from String to Enum