Add constant define
Fixed bugs