CORE-11: add Location annotation and implement