Added appropriate (although bigger) sizes for each constant