Added AMP dictionary and tests.