Add defaults and checks