improved Form type override