Added framework for location actions