Switched to using entry_points