Changes to Component.java to implement amount and volume