ACL and QueryBuilder converted to Builtin components