Change Location constructor to new key pattern