Flann matcher + Model enhacements