Added Location super class