Further improves reserved modularity, cli input processing