Added aspect ratio support