Add TODO
Use better lib name for custom chck lib