small api changes for better integration