Rebuild to support simple api