Refactory - Blueprint