Rework get handler, add getOne handler