Enhanced functionality