Move ACM-specific stuff to separate plugin