Refactoring: Use Type instead of String wherever it's possible