Modified python interface