Enhanced solution to be usable programmatically