Added - Project/Event Support + Misc Changes