[POC3] Add other features