Extended defintions

Signed-off-by: Tabor Kvasnicka <kamakwazee@gmail.com>