Fleshed out advanced features