Added small improvements