DEVSOL-403: Make key creation (sort of) work