Added RF storage support (removed UE storage support, conflicting method names)