Added Location and username