Add module version detected. Rename some methods