Renamed origin import method
Proper handlers architecture