Updated definitions for APPs