Definition updates, added basics, some more specifications