Changes for database and image creation