Add Compser support