Improved const definitions