Some api modifications