added Reader and Map features