Added basic economy implementation