Better organization for synapse