Enhanced for wider use