Leave creation related changes and enumerated class renamed to generic
name