extended schema and renamed functions

Signed-off-by: Dominic Böttger <Dominic.Boettger@inspirationlabs.com>