Add common components

@aduggin can you check this?