Added contracts support