Fixed alignment in VS and added DeliveryMode Enum