Code First Sample - modifications