Command Map Refactor + Options Refactor