Changed to string based keys