Condensed code

-Added NBT support