Changed internal property to public-api and added public-api