Added keys and fixed formatting