Updating to use validation