Added some functionality for initialization