Update and simplify API