Replacing class to extensions