Parametrized id, plus some bugfix