Improve solution comparison
Extract type to separate file if containing document contains multiple types