Initial commit with generic template