Prepareing for 1.5+ many changes