added initial contracts support
merged