contract integration + minor api change