Improve program interface