Added pixel scaling support