Updated API slightly