Enum in last part
Fix merge issue