Implemented QuantityCompanion in photo package
Other code improvements