Updated return values in shapes module