Update to use interface values

#7