Further refactoring and added stubs for load, assign, etc.