Add following functionality