Reworked the context class (acutally removed it).