Minor changes to include Granada.