Move existing version checks into override and add explicit package checks. Signed-off-by: George Sapkin <george@sapk.in>