Implement few improvement in overall module stability