Refactored models
Modified bootstrap script for agent