Adding more form features