Added TODOs to fix secret checking