Added boundary classes