Added couple of functionalties