Improve shell support section