Resolve #21 - Strategy