Add better keygroking