Added more fields and added new radio/checkbox helper