Make form more generic