Made api consistent