Added locations and some importes