added new models and bootstrap support