Added source picker and localisation