2.0.0 Revised API, additional input checks