Added more stuff to the assembler