Added several enums - with namespcae container