Updated API to be alittle bit easier to handle.