Improved the way we deal with since annotation
Updated CHANGELOG