Added more functionality to have a stable build.