API Interface updated with hopefully final contracts