Fix container bindings, add new contracts