Code clean-up + support of Parcelables subclasses and enums