Added lists. No actions implemented so far.
Minor fixes. Added placeholders for future change in ACS