MASTER => more enum