Added and modified objects for new functionality