Modified class def for RCP