Add further enhancements to the initial codebase.