Improved parsing API