Composition fixes, thread timer for Expiration Policy