Finish up Contract management - Manli