Adding minor feature updates