Add const and flags