Fixed exported properties and api messages