Modified boundary api