adding code for common components