Changing API of DAO to reflect multiple corelation types