Adding client and server components