Add more structure to currency plugin