Added structure for building other field types