Update of specs and some methods