Added in validation