Rehashed new parts of plugin