Refactored for code first