Adding Metashell support