Changing structure for a more easy to use template