Adding new version with several enhancements