Refactored types into aliases