some model updates
Merge branch '0.4' of github.com:boltphp/core into 0.4