Additional implementation details