added more fields to static form and handler