Cleaner API implementation