Adding bruce wayne support to data access