Added few enhancements