15: Support Location resolution 

Added comment