add boolean? helpers to properties
refactor values