Changed constant container & Fixed a posible bug on file reading