More model definitations and search implementations

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
v1.1.0_1