Use self instead of super::types