refactorings
expanded image types