BS-8524
Add DAO Expressions