Fixed partial contract fields and added utils