Handle more data validations, revamp utils.