Add missing components, interactive shell