- Improve: check for eruby subtypes