Add more objects
Bug fix