Various additions for contracts