Changed api back for the sake of backwards compatibility