Refactored for war file