ActiveRow wrapper added (POC)