Update and rename Model to Board