Add more logic to the form