Make indentations to 4!
Change image model to more generic file model