Added falcon storage support