Add attribute support and assembler bug fixes
More bug fixes