Add Image class to models and change Data and Context