Completely renamed, added enums