Some constants declaration considering issue #6, must change docs