Features/package improvements