Some validation in place
v0.0.4