Adding back exported functions