First commit for server component