Chanched BaseData and fixed link