Properties handling added.
Started JavaDoc