Improve API a little bit
Check params