fixed keys management, removed type