Added make public support