* Minor adjustment to DPAP components