Adding image model and few updates