Implement better location storrage