Added location class fields