Added toObject & toJson feature