Prepare for production usage by varghese