Const declarations update