Refactor annotation & support form text fields