Slightly modified some boundary API things to be more intuitive