A lot of improvements. Option templates and Option data is now supported

Signed-off-by: Delian Delchev <delian.delchev@gmail.com>