Updated API
License stuff