Issue #216 Followed design conventions