Import initial work towards scalar return types from dao methods