Add "Entry" class which will get some extra options ...