Update models to work with plugins + better syntax