moved generic value classes to fpai api