Contains validation added
Framework - JavaDoc improved