APD-605: Original functionality retained