Added a complete map interface