Moved to use templateing