As I recall, Madisons first version of the First Amendment offered a specific protection of liberty of conscience.
Madison was the leader of the House in he First Congress and he submitted a list of Amendments. It was sent to committee,modified, and then sent to the Senate, came back was further details, and then passed by both houses. I dont have a source right now, Just remembering.