Added basic advantage handling and reading