Added methods to cart class, renamed classes to avoid conflicts