Organize and add specs