Make Controllers container-aware + formatting