Improved generateCustomShortCuts to rely on data passed in