POC implementation to see feature working