Change to aliases and added r xpt template