added some more API stuffs, should be easyer to garantie working.