Added core location functionality