Changed result class  structure to delivery structure