Made API more generous