Adding documentation, updating namespace