Few API improvements