Issue #334: Finished moving action-mappings to annotations