Added aliases support 3rd party and local

Added aliases support 3rd party and local fixes #21