Search functionality, definitions now separated from declarations