Implemented Model/Device/Queue
Merge commit '1862a3f86d7737000a4bcf43bd274254031ccb71'
Fix build