Added proposal object and simplified some APIs