added default expiration dates; refactoring strongly needed