Added support for cropping