Removed erb stuff and replaced with generic entries