tmf: Removed static fields / method and added constant strings for the types and values