updated to cope with more params + added alias_map