Improvements + missing dependecies and specifics