add remove to heuristics
Added a by id loader