Added minor features