Add defaults and validation