Refactored to return a message builder
Release 0.2.0