Switched to Strongly Typed