Added include_images and improved init