Added location class for current position in type system