Added cropping support