added expiration handling in module
added expiration to view also