Improve const poc