Fixed DataContext and CreationScript