Reworking application para lookup to be backward compatible