Added minor improvements