Improving Features and implementing for future releases