add custom query method and imporve split mechanisms, resulting faster and more efficient discovering process.