Updated/added signatures, modified architecture and execution flow, enabled directory detection