Adding support for Delete by ID + new specs