Working on P-code endpoints.