Adapting to APDM needs