Added: Before and After methods added