Made API a bit clearer.