Align to sdk usage and conf