#408 Add constants
#408 Add single arg alternatives