License header updated and client API improvements