Added some features + control of input data