some features and constants added