Different enhancements as per Philipp suggestions