Corrected writing Parcelable
Moved out Enum hardcoded values