Add latest stuff from Aidaros