Add naming conventions, nestings an extends