Fix inheritance
Add reminder in comments