Added Enabled property to RP