Added configurable datasource for Model
Added logic in action to satisfy model loading