Changed basedur handling