Fixed image insertion; careful, schema changes