Turned the adding of default blocked models to a function to allow it to be loaded at server start
Merge branch 'unified' into faster
Removed duplicate code