Extension moved to separate file. #19