Added minor functionalities for features