Add remove functionality and `fields` options