Improved sub-components handling + node cast error fix (interfaces)