Fix docblock
Rename keys
Add check form key