Refactored common types