Partial api change

This will fix #86 .