Security Module Design - Fix #24