Updated copyrights, more API refactoring