Added local message lookup