Use newer compiler
Use newer compiler and use string keys for compatibility