Add more objects and attributes

More stuff == good