Package update and improvments