BasicUnit renamed to AbstractBasicUnit