Added Stubs for optimzation