little refactor for easier use + version plugin