#2 Adding initial support for After and Before