Improvements to allow non-entries in there