Fixed with Optional use
Implemented created predicate