Added required data

Signed-off-by: Robert Weber <closingtag@gmail.com>
Some bug fixing and optimization.

Signed-off-by: Robert Weber <closingtag@gmail.com>