Add (Before|After)[Class] from helper and respect spaces from source code