Moved stuff around and better handling of bias attributes