A few more updates

Added classes