I think i need to re-think a bit my code too, i am developing atm a CMS for sites but i don't use lot of the new features...