Added part of Extra-s library