Added more special form handling