More generic and package added for easier install