Added content resolving to PropertiesLoader and tokenization.