Added location field and other stuff