Added features at risk to boilerplate