Added attribute containers