Updated few methods