Images refactor