Correct bundle prefix
Add more model interfaces