Added a callbacks model
Improved fixture loading