Add simple functional and stubs