Added constants to a map
Added a thread test, needs to be integrated into main project