Moved to Baum, again
Added model validating