Put database attributes in right place ...