Bugfixing checked attrs module and improved code