Added paperSize support