Few small additions