Adding shell capability (port from old pb)