Streamlined basic structure - no more bond objects