Enhancement: Update API for increased consistency