Improve working with images