Can now pass fields through as well