Remove some complexity in componentes and optimize SFAPin in runtime