Add expired information in lookup support
Merge pull request #368 from quamilek/feature/expired-support

Add expired information in lookup support