Simplified API and added reflecton for handling Entryies.