add multiple entries
fix bugs, extract driver