Added missing form features