Minor changes to basci structure