Improved template for SWD Starter