Feature/key rework