Updated some ID's, added version support