update: with enums included