New: Support and Other Improvements