Improved @ support