Use message type constants instead of strings
Improved future timeout
Renamed message package