Improve, refactor, update framework