Replacing Enum with annotation

Now tags are annotations instead of enum