Preliminary changes for PS change to support custom action