Updates to code to match interface spec