improved secret vs secrets handling