First changes to implement new multiple location sets