Enhancement: Working POC