Rewrite all the code without js object for method, only for data