1D-support added for boundary