Merge "Added more enumarations"