Added new functions and stubs