Version 0.4 with namespaces and new flow