#61 Optional size limits now enforced