Updated module template and demo