Added images and updated schemas with indexes