Work around current implementations

1. Implemented resolution.
2. Work around current implementations.
3. Changed Sample