Now using individual parameter lists dependant on AP type, enabling issue #3 to be addressed