Moved PositionBasedExpression outside of PositionBasedConnector class