Clean up the existing implementation to accommodate version 2 simplified structure and use cases.
Clean up the existing implementation to accommodate version 2 simplified structure and use cases.