Adding few enhancements mentioned by the final customer.