Added bond and attribute storage