RaaSAdapter enhanced