Template and info class refac
Add serve method