Small API enhancement