Added contract class - Bug fix