Added none types